Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix J9 Module #2341

Merged
merged 12 commits into from
Dec 15, 2021
Merged

Fix J9 Module #2341

merged 12 commits into from
Dec 15, 2021

Conversation

SylvainJuge
Copy link
Member

@SylvainJuge SylvainJuge commented Dec 14, 2021 •
edited by zube bot
Loading

What does this PR do?

Fixes #2336
Fixes #2203

Checklist

  • This is a bugfix
    • I have updated CHANGELOG.asciidoc
    • I have added tests that would fail without this fix
    • Investigate why current Integration tests fail with J9 (they still fail even with this fix) this is a docker issue, containers now need to have --cgroupns host option otherwise they don't see the expected files in /proc/self/cgroup. This should be covered for all agents through cgroups v2 container.id discovery apm#523

@SylvainJuge SylvainJuge self-assigned this Dec 14, 2021
@SylvainJuge SylvainJuge mentioned this pull request Dec 14, 2021
Closed
@apmmachine
Copy link
Contributor

apmmachine commented Dec 14, 2021 •
edited
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2021-12-15T09:09:44.224+0000

  • Duration: 67 min 21 sec

  • Commit: 73c9454

Test stats 🧪

Test Results
Failed 0
Passed 2639
Skipped 21
Total 2660

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • run benchmark tests : Run the benchmark test.

  • run compatibility tests : Run the JDK Compatibility test.

  • run integration tests : Run the APM-ITs.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@SylvainJuge SylvainJuge marked this pull request as ready for review December 14, 2021 15:44
eyalkoren
eyalkoren approved these changes Dec 14, 2021
View reviewed changes
Copy link
Contributor

@eyalkoren eyalkoren left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!
If integration tests pass, I assume we are good to go with that.

...ests/application-server-integration-tests/src/test/java/co/elastic/apm/servlet/TomcatIT.java
//{"jdk11-adoptopenjdk-openj9"},
//{"9.0.50-jdk11-adoptopenjdk-openj9"}
{"jdk11-adoptopenjdk-openj9"},
{"9.0.50-jdk11-adoptopenjdk-openj9"}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉

apm-agent-core/src/main/java/co/elastic/apm/agent/bci/IndyBootstrap.java Show resolved Hide resolved
@felixbarny
Copy link
Member

Consider checking in the relocated classes in src/main/resources so that after a min clean executing unit tests from the IDE still works.

@SylvainJuge SylvainJuge added the await-release Mark issues that depend on next release, or PRs that are planned to be included label Dec 15, 2021
@SylvainJuge SylvainJuge merged commit 55ad185 into elastic:master Dec 15, 2021
@SylvainJuge SylvainJuge deleted the fix-openj9-module branch December 15, 2021 12:31
@SylvainJuge SylvainJuge mentioned this pull request Dec 16, 2021
Merged
@SylvainJuge SylvainJuge removed the await-release Mark issues that depend on next release, or PRs that are planned to be included label Dec 17, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eyalkoren eyalkoren eyalkoren approved these changes

Assignees

@SylvainJuge SylvainJuge

Labels
agent-java
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Can't run any of the latest verions on a OpenJ9 JVM openJ9 JDK11 with tomcat fails to propagate context
4 participants
@SylvainJuge @apmmachine @felixbarny @eyalkoren